style changes and comments.