Fixed formatting & comments