Code cleanup

Cleaned up some of the sound loading code.