Tidy and re-run