oop-code-refactor