removed unneeded closure wraps