refactoring of content setup