Fixed up formats of 3.1