Improve code climate