Edits and comments

I’ve made edits, comments up to line 85. Please go through every one of
them, one-by-one and address them accordingly.

Thanks.