Cleanup / re-factor. Pair audio thread with demod