Refactoring, Code clean up
Rename some class name, more readable
Refactoring, code clean