msic: some refractoring