clean up closure calls a little