Some cleaning up (PEP-8)