Refactor raw sound module to 100 line limit