Redone comments.
More linting