More commenting and some clean up