Some minor formatting cleanup and add some comments