Slight refactor of CartoCSS for map features