Comments updated
Enum for civil status
Comment added
White-spaces removed