Code style improvements here and there
Merge pull request #1714 from juancarlospaco/fix/settings

[settings] Code style improvements here and there