Refactoring of custom render blocks