Cleaning up file name expansions