Remove decorator
PEP8 fixes