Teensy refactor