Updated for rubocop and foodcritic