Settings: code cleanup

Change-Id: I6787aee04548263f56c31d3b203ace129521a421