cleaned up individual sample lookup