TSAGE: Further cleanup of existing R2R MazeUI code