add province city requirerequired validation
cleanup code