cleaned up monitor class