Refactoring to wrap blocks.