Cleanup

Remove getter/predicate functions and replace them with method references or lambdas