TSAGE: R2R - Some refactoring in scene 1337