Refactoring into module.