minor clean up
more minor nit clean up