Use config keys, code cleanup