V2: Cleaning up find methods