Appease the pylint and pep8 gods

Improve the style of the code base. Spaces are not evil!