Small fixes, pep8