Doc and formatting changes