Added some separation and improved reading order