cleaned up the implementation of KiiClause and KiiCondition