Refactoring free space handling - getting ready to introduce policies