Simplify expansion calculation