Settings: A little cleaning up

Change-Id: I191c2c433d2b188f7ffc9b804d8d2ed44a04f5ad