mathlib3

5d88c110 - Apply suggestions from code review