fix FC017 and FC023

some foodcritic cleanup