Spacing, quoting and minor style fixes