Refactor City model