continued refactoring of flare import