Minor fixes
Formatting updates

As suggested by pep8 and pep257, however not all are addressed.