python refactoring
+