Refactor individuals to be DRY