Cleanup. Add city search to weather choice.