Fixed up the ingots a bit + formatter time!