keywords implementation change
remove unnecessary tuple/list
remove unnecessary ordering