cleanup and minor tweaks