Remove trace prints
PEP8 fixes