refactor oop
refactor
remove option