Rubocop fixes 

Refactoring code to pass rubocop tests and foodcritic tests, preparing for kitchen tests as well.