Refactoring of PenLift