code cleanup
update code