improve the usage of pundit