refactoring Expansion Operators...