Don't shadow parameters and use better string comparisons