pep/style fixes