Code cleanup (PEP-8 OCD)