Some rubocop cleanup