Refactored city class to follow the right naming convetion