code cleanup
update