Latest suggestions addressed
Linting