tidy up; source search