Clean Classes, Clean Entities, Refactor MediaManager