Cleaned up findProject()