More cosmetic edits...