Settings: code cleanup

Change-Id: I4bd9ad9d059650f1940895491f9598bf9480d037