C03 refactor request