Tidying
Couple of charts done, tables next