Some reformatting.
Small refactorings in web server.