Code cleanup and added dragon to sound class