A little change for keys (Mostly cleanup)