PEP8 cleanup before real changes