Code Climate fixes