Refactor Video application