bringing up code climate, refactoring - Saveen