web: code clean up
merge conflicts