Clean up

Removed useless variable "row".

Changed pointer equality test to string equality test.