Remove duplicate dependencies
Improve address line generation