refactor content service