Status monitor cleanup and refactoring.