PEP8 code style updates throughout