Visual Studio tidy up