cleaning up
code udpate