Refactored jukebox to use objects