more rubocop cleanup