NFold Refactoring