Little code refactoring in module search files