Some minor comments and style changes