Finally refactor ConfigSettings (missed it first time)