small performance improvement of dynamic eval
refactor exports