remove duplicate key, fix comments