More general tidying-up
Refactoring & tidying up

Refactoring more startup code from index.html into City.init(), and
misc. tidying up of old/redundant/duplicate code.