small request handling simplification