Some cleanup. Some...
PEP8