More cleanup duties - reordering methods in DialogueGraphVisitor, removing TODOs, removing whitespace