Clean up of UCR

Cleanup of use-cases, formatting, typos, etc.