Revise key-format and refactor