fix validation util computation
simplify validation util code