Merge "Use strtr() for clarity"