Formatting/Style tweaks.