Add title to encounter.  Clean up code.