[updated] naming minor refactoring
[updated] oop structure minor refactoring