mostly just fixed formating