Simplification and change some of the structuring