Refactor soundsystem