Simplify parseQueryString implementation
Style tweaks