Refactor visa status.