Close #7: Separated audio index code from other audio related code