1. Refactoring: Remove block_ prefix