Continue refactoring playlist