Code cleanup, esp. pep8