I think it's fine to keep this as-is for this PR. We can sweep through with a cleanup/alphabetize on exports later on.