Refactor request update/create