general formatting changes