Small comment and style changes and removal of unused code.