Replaced explicit block calls with yield
Updated utilities