prepare for pytutor refactoring