Fix check context wreakage and improve output readability