Cleaned up the monitor package