Refactor some issue
Refactor