Fixing foodcritic and rubocop complaints