clean up code change -bug fix