refactored music collection