More closures and better names.