refactor after mentor session