cleaner classes at lines 9, 31, 33, 37, 34, 58, 60, 61, 64, 70, 87, 88
Merge branch 'content_staging'