round 2 of removing hardcoded strings