Add isOr() method to SClause2
Reformat code
Remove @robindelgado code + refactoring
Remove deprecated methods
Fix misc. cmpilation issues due to previous refactoring