change sound and clean some code