exposed find and cleaned up a few small methods