Refactor exports