minor cleanup of function literals