PEP-8 and some minor deletions