minor cleanup
Refactoring Recorder Code
Merge pull request #74 from penguinho/master

Refactoring Recorder Code