More format spec work