some cleanup
bug fix