Refactoring to exports methods straightforward