Update class name and refactor some stuff.

Signed-off-by: Archer70 <code.archer70@gmail.com>