Start working towards better pep8 compliance

Start working towards pep8 compliance...