Grammer cleanup, figure renumbering