improve readability a bit
fix performance degrade of attaching PBAtLeastData