minor clean up
ran unit-tests