Refactoring of program structure!