get wildcard loop tidy up

get wildcard loop tidy up