Cleaned up Bar and Treemap.