Refactoring: better module and function name