Fixed few design suggestions by the Visual Studio Code Analysis tool