fixed some smells
added others
I should have been on a feature branch
rubocop likes to delete things
fixed rubocop errors
I should have made a commit for each one of these
cleaned up unit tests