Tidy affinity rule copyrights and add predicate strategy