Better pre formatting