Removed the RestParameter class and moved functionality to BuildUri.
Implemented a small query clean up.