refactor content types