videos refactor