Remove the structuring comments

Now, the structure is clearly visible :-)