Minor tweaks, bit of cleanup.