Removing duplicated code in Settings classes
Still removing duplicated code in Settings classes
Merge branch 'merging'