Minor refactor of settings