Refactor video