Take two on better formatting.