minor clean up and comments