Reorder, split into smaller sections, link to code