refactor of content functions