Clean + pedantic reform