Simplify virus status checking code