Applied rest of the comments and fixed comments.