stylistic changes and more comments - we now pass pep8 --max-line-length=105