Better data formatting and ggplotting