misc formatting changes