simplify predicate methods
make record login shorter
Merge pull request #147 from gregmolnar/refactor

Thanks for taking the time to clean this up.