added case filter for m4change fluff classes, minor refactoring