WIP: pep8 and whitespace cleanup

Change-Id: I3576a52e5e89c5498aaebd257567694af6bc4160