#315 formatting