Feature/cleanup

Minor changes to fix Foodcritic warnings.