Cleaning up and adding some pillar