Make minor improvements to comments and formatting