Cleanup settings manipulation
Merge pull request #100 from Dmitry-Me/cleanupSettingsManipulation

Cleanup settings manipulation