refactoring unrelated to key default