minor clean up tweaks