Refactoring to handle blocks more gracefully