Merge "Improve code metrics"