web monitor refactor