Removed commented line.
Refactored CiString comparison.