simplification + class names to follow leaflet 0.6