More tweaking codeclimate stuff