Making a few comment and style changes.