Resolves #1. Moved the formatting code from the beforeFind into the actual find method, for neatness, and to reduce extra callbacks