Code clean up (PEP 8 fixes)