Improve comments, minor formatting changes