Refactor media list