Fixing rubocop, part I