Refactoring after live session