Basic code folding, slightly closer to the way I expect