Fixing Rubocop/Foodcritic issues