Refactored choropleth method to take input data, cleaned up code/comments