Some cosmetic formatting changes