A little cleanup and minor tweaks