Code clean-up on web.lisp