Basic Bar Chart clean up (including AdapterFactory)