clean up and updated output to include self_uri for all methods