Fixed formatting
Fixed source encoding warning
Avoid MRESOURCES-140