Refactoring music app
Refactor function names