Minor cleanup
Simplified request parsing