Removed conversations and improved comments