minor refactoring and fixed issue with game music playing when loading