Refactored block definition