mathlib3

ea369969 - clean up variables and slight golf