Block refactor