Cleanup: use 'do...end' blocks instead of '{...}'