Improve MusicPlayer. Cleanup.