Block refactor follow-up