Minor changes in program structure.