Split up deflator logic