formatting changes from after class