Update to code comments, minor style changes