Made sections work with the Id factory.
A little bit of reformatting