Minor formatting changes and comments