refactor into common-content