more cleanup, demo uses new colorbrewer api