Revert "Foodcritic cleanups"

This reverts commit e59e131ad84bb6030ac4f0e492040cbd5c4fda84.