PEP8 compatibility and architecture changes