Clean up code to use export.