[Refactor] Remove obsolete workaround for Qt 4.4
[Refactor] Enum formatting
[Refactor] Simplification using `value()` method, de-nesting