Settings: Code cleanup

Change-Id: I0c77803205db95aa3a292b56381860e865855a7e