Added PredicateBuilder for future use.
A few minor cleanup items