Improve syntaxt to more closely match pep8 standard, in particular docstrings