Style and structure tweaks.