Improved some code metrics