change class names.
optimize some code.