Some gentle cleanup and commenting
Some gentle cleanup and commenting