Fixed up Code Climate issues