Refactor to avoid another loop. Uppercased everything.