Refactored sound module