(PSP) Refactor audio