More check style fixes in Util class