Improved DotSettings file.
Code cleanup.