Another set of minor style edits