Format comments better