Minor changes in code structure.