pep8 / style improvements: remove semicolons, regularize newlines.