Video decorator (solution refactor)