Refactoring
Use correct python