improve code quality metrics (II).