Update endpoint controller specs +factory
Clean up contents controller code
Comment content model for neater code