Fix some code smells ala code climate