Add sound
Refactor code