Cities: clean up
Cities: add comments