PEP8 cleanup. Passes with --ignore E221,E501