Refactored Oscilloscope