Refactor songs list