Foodcritic fixes
Cleaned up code a bit.