Refactoring for song