Cleaned up some code.
Fixed PossibleNullReferenceException ReShaper suppression.
Fixed Control.On