refactoring music once more again