Minor changes

Minor changes in the structure