Refactored, polishing
Merge remote-tracking branch 'origin/DAT-2156_Curated_Content' into DAT-2156_Curated_Content