fix some bugs, remove Condition class