Clean media_set model and add refactor factory