[Export] little refactor