Refactor/for code climate