Cleaning up before drawing diagrams
Tidying up figure numbers