replacing gargoyle with waffle
pep8 fixes