code refactoring to support playback from rdf to git