Make minor style and comment improvements