Better flow of control due to code refactoring