Issue #29: Refactor of C code into class, removal of DFA_ID paramter