Refactored forest