overall refactoring in the FilamentSpool code