clean up code
finished code clean up
finsished code update