Tin Marković Refactoring In Python