[v6r10] Unifying check format

Started from fixing a bug, ended removing duplicated code.