Round 1 of removing hardcoded strings