Applied comments, and fixed few linter errors.