Settings: Code Cleanup

Change-Id: I6638bc8bb43a688f35f9cadd3b42a65b4ae65287