Minor tidyups
Adhere to pep8 guidelines