reformatted some stuff again