Fix some formatting on import and export