Cleaned up monitor