refactor addressentry