Code cleanup suggested by Visual Studio's Code Analysis feature