refactors exported things to be more homogenous