Refactored and Consolidated Blocks