Flesh out the audio stream
Clean up some code using type inference