Refactor content