Fix formatting further