Moving some constants into centralized Constants.cs cleaning up strings and ensuring null checks.