small cleanup, mostly pep8 related modifications