Map should be driven by a data source.
Code style and import cleanup.