Refactor export elements