[WIP] Tidy and Reduce