Processed more comments

processed all comments