Analog plotting refactoring