Refactor the map targets code to prevent the heatmap class becoming too
unwieldy