Little cleanup
URI property