Minor comments and formatting. No functional changes