Clean code and fix bug

need read some file