More cosmetic formatting