Refactor: pre-commit cleanups