Initial refactorings

Added a few predicate methods