Minor refactoring and formating
Minor refactoring and formating

stevenpkg/conversation-with-discovery,stevenpkg/conversation-with-discovery,stevenpkg/conversation-with-discovery,stevenpkg/conversation-with-discovery