Remove optional sq brackets for readability
Split export and import modules