Settings for ring locker, code cleanup