Minor code cleanup
Allow to display data on a map