Move attribute comparator with others
Merge pull request #1049 from teamso/reformat

Move attribute comparator with others