Fixed formatting in places