* [Enhancement] refactor base data elment * fix comment * fix comment * fix pop not existing key without error