Audio Sound update and Code cleanup.