code cleanup in DFA tool