updated individual to have unique ID and cleaned up some code