Refactor: Cleanup JJB for pre-commit