More fixes from Code Climate