Extra refactoring of module methods