Code cleanup and sounds