Minor tweaks & clean up