Commenting and cleanup for webserver