clean up code
code cleaning