refactore code
fix class name