Song refactored