Minor XAML refactoring by R#