Expanding globs
Refactored