Extracted hard-coded severity name strings.
Fixed many lint warnings and removed unused strings.