Correct headers move members.
Cleanups:
* Remove obsolete string formatting function
* Remove unused ADDRESS macro
* Re-scope function to reduce pollution
Use dependency injection to reduce coupling