Refactoring cleanup, export option.