#11 Improve code metrix