Cleaned up the monitor package
Merge pull request #1640 from pveentjer/cleanup/monitor

Cleaned up the monitor package