code climate feedback, refactor, TODOs