restructure UFS checker