round 3 of removing hardcoded strings.