wip: improve codeclimate rating