reformatted some stuff