Refactoring city mechanism and some city time work