Cleaning up block scopes