minor formatting changes and comments