format and recommit