Minor changes before attempting to clean up find functions