Some minor changes, mainly formatting
Stylistic changes PEP8