Some foodcritic and rubocop correction