Fortmatting cleanup