fixed identation and URIs