Improved linting
Minor changes