minor clean up in code