Merge "[Settings] Code refactor"