Slightly simplifies request handling dispach logic.
Whitespace cleanup.