style changes and comment edits