cleaned up dfa