change class names
code formatter
update logic, code to simple