AC-FOVE: code cleaning

* Code cleaning in MacroOperation, Shatter and ShatterOnQuery