gerneral code clean up
gerneral code clean up