refactor

1. refacor code;
2. update dictionary.