Some changes

I did some small changes according to the comments.