Cleanup: URI -> Option[URI]

Signed-off-by: Gary Pamparà <gpampara@gmail.com>