Move things around and add comments