A couple minor tweaks and some cleanup.