Make plot callbacks better
Refactor tps-rpm plotting code