Refactoring savecontent

No need to get content twice?!