Refactor code, create target_state_name()