more rubocop cleanup; fully passing