Fixing FC016 and FC017

Pass Foodcritic