style change: no comma-deliniated vars, normalized module closures