reformat some stuff