Cleanup + fix typo on export