Refactor liftBody