More tweaks to general style.