Sound code cleanups