round 3b of removing hardcoded strings. Bug fix