Refactoring for Export: Small changes