small refactor on addressing unit