small refactoring replays