Small refactoring to make the whole code alike
Added common CheckResult