some comments and formatting changes