Refactored video module