Tiny refactoring to URI data type for clarity