Fixed formatting further