Cleanup: comments.
Improve address formatting.