Further refactor check running