added typed formatting