Format comments fix - again