Some code style fixes (pep8)