Cleanup
Add residential to Address