Refactoring Recorder Code