fix: address gemini pr comment and move the export in a alphabetical order