Refactoring: Proper Exporting