Trying to clean up vigor-audio.c first run through