Refact

good enough for presentation