Converted static readonly fields to const