Fixed few more design suggestions by the Visual Studio Code Analysis tool