minor cleanup

minor tweaks pending initial review