Improved program structure.