Refactorings, slight Sound update