Various minor stylistic changes