Simplify predicates on AST
Correct access modifier