Format tweak
Shift everything into one module, avoid orphans
prettyExt