Clean up accessors. Override find helper.