trivial tuning
cleanup s_closure