Refactor audio stop/start