Refactored some video updates