code cleanup and dialog clarification