Cleaned up video factory