Added organizations and websites
Refactored format_entities to private