refactoring on VideoData and update constant references