Some changes by comments