cleaned up all the figures