cleaned up uri_parser class