code clearnup
code cleanup