Fixed structure
Added comments