Final refactoring before parameters extraction