A little cleanup
Added recorder class.