Refactoring savecontent
Merge pull request #1216 from rarila/refactoring-savecontent

Refactoring savecontent