Little subheader and main cleanup.