Refactored creating video