[WIP] Reflow for maximum readability