Refactor: Cleanup TA JJB for pre-commit