More rubocop cleanup