Make URIParser code more readable - Part 2