Refactor addresses
Praise Lord