Minor tweaks and pep8 fixes.