Some changes on comments