Code edit - refactors address helpers