Simple formatting, refactored add-city