minor refactoring and implemented contains method for District
quick refactoring