Cleaned up sound code