Refactoring /Current video store