Minor comment and format changes