Fixed some style issues detected by the Visual Studio Code Analysis