Refactored vlidation for City