Made CreateOrUpdateContentRpcHandler a bit more readable