refactor key format