[CLEANUP] Data access check style clean up