code re-organize and add arrow in dictionary setting