pep8 style fixes, remove unused methods