Refactor current_city