Transmitter dev, refactoring