Minor editing. A bit of a clean-up, UI-wise.