And even more little refactoring of handChecker