Removed dead code
Factored out city, put in more ignore words