create compilant URI class; code cleanup