refactored URI; edited comments