Various minor formatting change requests