cleaning and comenting
structure reorganized