Refactoring of OOPEmulator
Updated NRefactory