Clean up commit hygiene a lot