finished general formatting changes