clean up settings-related files

mostly style, but also getting rid of a little cruft