Doing some cleanup to the UriTemplate class