Further fixes formatting