Updated city extract method, moved to Java 8, a bunch of source formatting