Minor tweaks + cleanup.