review and update code
update code
remove comments and refactor