Refactoring variables + fixing MusicOptions bug