Rework refactoring tutorial