Refactored address method