refactoring of the tutorial topic