Refactor code
Merge Video.java