Make dictionary keys constants
Revise the routine for holding settings