Cleanup
Use constantized class name instead of Recording