Refactoring FLease
Refactoring FLease