Minor restructuring and updates.