Improve the javadoc of City