Clean up quoting and spacing a bit