Minor ESlint changes

brickoderequested to merge
(removed):hotfixes into pregmod-master

Also some more linting

Merge request reports