#11 Improve code metric