Code cleanup of choropleth, shortening of vars, compacting