rubocop and foodcritic fixes