Minor cleanup in webmonitor package
Merge pull request #1672 from pveentjer/cleanup/webmonitor

Minor cleanup in webmonitor package