[REFACTORING] rename class, indent code, remove useless code