Converted some static variables to const per ReSharper recommendations for code optimization