Some renumbering and formatting