Tiny refactor again https://github.com/KanoComputing/kano-settings/issues/91