Refactors video model to be more OO