Clean up casing and numbering