minor cosmetics
minor cosmetics
using closures to DRY
cleanup