Some changes based on the VS Code Analysis tool