refactor based on having less exports