Blocks refactoring