Code cleanup (PEP-8, etc.)