Cleaned up Probe class.