Refactoring object-oriented
Control flow