Pep8 cleanup

Please do not merge it before I finish working on it.