Refactored addresses somewhat