some minor formatting changes and so on