- Merge label and popupContent properties for vector layers, as only one is ever used - Move common vector methods to separate file and remove duplicates - Rename isHTML properties to be clearer