style changes and fixes for comments