Refactor Video class, conditions and variables