Refactoring in city demo