Little handChecker refactor