Cleanup settings class

Change-Id: Ifad4902077f4c8e608490c18d0a33f8923078bf9
Improve docs

Change-Id: I5004b0fe4fad8db81fb477dadfda29adaa9c6219