PEP8 compliance and cleanup