Refactor Citizen Class