Cleanup conversation methods and add comments