More PEP8 cleanup
Merge branch 'cleanup' into dev