Merge "Refactor: pre-commit cleanups"