More comments and minor formatting changes