PEP8 cleanup before committing any more changes