Cleaned up code
Made choropleth size dynamic