removed debug output
wolfram trigger cleanup
cleaned up factory/subclass implementation