MusicImporterBuilder improvement + clean-up