Small refactor of legacy https://github.com/KanoComputing/kano-settings/issues/91