Refactoring Audio component