Refactoring + Basic Sound