Improve code-climate