Don't use Enum.ToString
Some tuning